From a4df08a6c7e83d26e2ea4aca1c11b29004d7d1c4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 26 Aug 2005 16:29:40 +0000 Subject: [PATCH] Avoid an uninitialized variable warning, pointed out by Colin Walters. 2005-08-26 Matthias Clasen * gtk/gtkicontheme.c (theme_lookup_icon): Avoid an uninitialized variable warning, pointed out by Colin Walters. (#314585) --- ChangeLog | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ gtk/gtkicontheme.c | 4 ++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7f56329dc..04b55dc997 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-08-26 Matthias Clasen + + * gtk/gtkicontheme.c (theme_lookup_icon): Avoid an uninitialized + variable warning, pointed out by Colin Walters. (#314585) + 2005-08-26 Tor Lillqvist * gtk/gtkfilesystemwin32.c: Remove some ifdeffed out debugging diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index c7f56329dc..04b55dc997 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2005-08-26 Matthias Clasen + + * gtk/gtkicontheme.c (theme_lookup_icon): Avoid an uninitialized + variable warning, pointed out by Colin Walters. (#314585) + 2005-08-26 Tor Lillqvist * gtk/gtkfilesystemwin32.c: Remove some ifdeffed out debugging diff --git a/gtk/gtkicontheme.c b/gtk/gtkicontheme.c index c4e88b2550..3afe959248 100644 --- a/gtk/gtkicontheme.c +++ b/gtk/gtkicontheme.c @@ -1804,7 +1804,7 @@ theme_dir_get_icon_suffix (IconThemeDir *dir, suffix = suffix & ~HAS_ICON_FILE; } else - suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name)); + suffix = GPOINTER_TO_UINT (g_hash_table_lookup (dir->icons, icon_name)); GTK_NOTE (ICONTHEME, g_print ("get_icon_suffix%s %d\n", dir->cache ? " (cached)" : "", suffix)); @@ -1893,7 +1893,7 @@ theme_lookup_icon (IconTheme *theme, if (min_dir) { GtkIconInfo *icon_info = icon_info_new (); - gboolean has_icon_file; + gboolean has_icon_file = FALSE; suffix = theme_dir_get_icon_suffix (min_dir, icon_name, &has_icon_file); suffix = best_suffix (suffix, allow_svg); -- 2.30.2